From 348ffaea19fb09c15761e061f7521a20dd8322ee Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 2 Jan 2006 09:32:56 +0000 Subject: [PATCH] Make identical to the X11 implementation. (#322264, John Ehresman) 2006-01-02 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_get_visible_region): Make identical to the X11 implementation. (#322264, John Ehresman) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gdk/win32/gdkwindow-win32.c | 20 -------------------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index f83d8d7625..712286122f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-01-02 Tor Lillqvist + * gdk/win32/gdkwindow-win32.c + (gdk_window_impl_win32_get_visible_region): Make identical to the + X11 implementation. (#322264, John Ehresman) + * gdk/win32/gdkgeometry-win32.c (gdk_window_scroll): Get the invalidated region from ScrollWindowEx() instead of an incorrect attempt to calculate it ourselves. Fix by John Ehresman. (#323666) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f83d8d7625..712286122f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-01-02 Tor Lillqvist + * gdk/win32/gdkwindow-win32.c + (gdk_window_impl_win32_get_visible_region): Make identical to the + X11 implementation. (#322264, John Ehresman) + * gdk/win32/gdkgeometry-win32.c (gdk_window_scroll): Get the invalidated region from ScrollWindowEx() instead of an incorrect attempt to calculate it ourselves. Fix by John Ehresman. (#323666) diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 580ac1c3f4..d5c29f567b 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -282,7 +282,6 @@ gdk_window_impl_win32_get_visible_region (GdkDrawable *drawable) { GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (drawable); GdkRectangle result_rect; - HDC hdc; result_rect.x = 0; result_rect.y = 0; @@ -291,25 +290,6 @@ gdk_window_impl_win32_get_visible_region (GdkDrawable *drawable) gdk_rectangle_intersect (&result_rect, &impl->position_info.clip_rect, &result_rect); - /* take this win32 specific part into account (smaller when obscured) */ - hdc = GetDC (GDK_DRAWABLE_IMPL_WIN32_HANDLE (impl)); - if (hdc) - { - RECT r; - if (SIMPLEREGION == GetClipBox (hdc, &r)) - { - GdkRectangle gr; - - gr.x = r.left + impl->position_info.x_offset; - gr.y = r.top + impl->position_info.y_offset; - gr.width = r.right - r.left; - gr.height = r.bottom - r.top; - - gdk_rectangle_intersect (&result_rect, &gr, &result_rect); - } - ReleaseDC (GDK_DRAWABLE_IMPL_WIN32_HANDLE (drawable), hdc); - } - return gdk_region_rectangle (&result_rect); } -- 2.30.2